Fix more no-value-added GCC warnings.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4124 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/compegps.c b/gpsbabel/compegps.c
index 1ff184f60a771d2d74e08a106fa39a82303a412c..19630303871e994f6f0edea98502d343e0957b4d 100644 (file)
--- a/gpsbabel/compegps.c
+++ b/gpsbabel/compegps.c
@@ -681,6 +681,7 @@ compegps_data_write(void)
 
   switch (global_opts.objective) {
   case wptdata:
+  case unknown_gpsdata:
     curr_index = target_index = 0;
     write_waypoints();
     break;

diff --git a/gpsbabel/itracku.c b/gpsbabel/itracku.c
index 24092284f53fd41ac25f96a7d81a5c038d1b60ad..be26c2e7ac584924c1c8898dfe81e4cbeafb567b 100644 (file)
--- a/gpsbabel/itracku.c
+++ b/gpsbabel/itracku.c
@@ -608,6 +608,7 @@ itracku_read(void)
 {
   switch (global_opts.objective) {
   case wptdata:
+  case unknown_gpsdata:
     itracku_read_waypt();
     break;
   case trkdata:

diff --git a/gpsbabel/mac/libusb/darwin.c b/gpsbabel/mac/libusb/darwin.c
index 91825cb051d6fef368d633bf83ab98bb917b717b..749e09eccc13f7193736f43e65fab333a8a1f142 100644 (file)
--- a/gpsbabel/mac/libusb/darwin.c
+++ b/gpsbabel/mac/libusb/darwin.c
@@ -1115,7 +1115,7 @@ int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices)
     result = (*(device))->GetDeviceAddress(device, (USBDeviceAddress *)&address);
 
     if (usb_debug >= 2)
-      fprintf(stderr, "usb_os_find_devices: Found USB device at location 0x%08lx\n", location);
+      fprintf(stderr, "usb_os_find_devices: Found USB device at location 0x%08lx\n", (long) location);
 
     /* first byte of location appears to be associated with the device's bus */
     if (location >> 24 == bus_loc >> 24) {
@@ -1143,7 +1143,7 @@ int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices)
 
       if (usb_debug >= 2)
        fprintf(stderr, "usb_os_find_devices: Found %s on %s at location 0x%08lx\n",
-               dev->filename, bus->dirname, location);
+               dev->filename, bus->dirname, (long) location);
     }
 
     /* release the device now */

diff --git a/gpsbabel/mmo.c b/gpsbabel/mmo.c
index 4b4671b2de4523ac1cb8848f5209d2cedebacd73..58f9843b467d34c73340719f0f611c8d97f42082 100644 (file)
--- a/gpsbabel/mmo.c
+++ b/gpsbabel/mmo.c
@@ -212,7 +212,9 @@ mmo_readstr(void)
   if (len) {
     gbfread(res, len, 1, fin);
     if (len != strlen(res)) {
-      fprintf(stdout, "got len %d but str is '%s' (strlen %d)\n", len, res, strlen(res));
+      // strlen requires a size_t, but Microsoft's stupid compiler doesn't
+      // do C99 %zd.  Thanx, Microsoft.
+      fprintf(stdout, "got len %d but str is '%s' (strlen %d)\n", len, res, (int) strlen(res));
       fatal(MYNAME ": Error in file structure!\n");
     }
   }
@@ -858,12 +860,12 @@ mmo_read_CObjCurrentPosition(mmo_data_t* data)
     xfree(name);
     // XXX ARB was just: mmo_fillbuf(buf, 13, 1);
     // but actually it's string/long/string/long/long
-    gbfgetuint32(fin);
+    (void) gbfgetuint32(fin);
     name = mmo_readstr();
     DBG((sobj, "name = \"%s\"\n", name));
     xfree(name);
-    gbfgetuint32(fin);
-    gbfgetuint32(fin);
+    (void) gbfgetuint32(fin);
+    (void) gbfgetuint32(fin);
   }
 }
 

diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.c
index 056f53e36049124c3571a18a3e0cbe9dd36bdb8e..d5f6e7a794ffb6330186b862f8f0fe7d9013ddd9 100644 (file)
--- a/gpsbabel/ozi.c
+++ b/gpsbabel/ozi.c
@@ -816,6 +816,7 @@ data_read(void)
 
           break;
         case wptdata:
+        case unknown_gpsdata:
           ozi_parse_waypt(i, s, wpt_tmp, fsdata);
           break;
         case posndata:
@@ -844,6 +845,7 @@ data_read(void)
         }
         break;
       case wptdata:
+      case unknown_gpsdata:
         if (linecount > 4) {  /* skipping over file header */
           fs_chain_add(&(wpt_tmp->fs),
                        (format_specific_data *) fsdata);

diff --git a/gpsbabel/pathaway.c b/gpsbabel/pathaway.c
index 3404769647a690e8258c15e2b91d505ca5ffb1a2..e88b3acaae66d51c92312aab13e33e0229548e97 100644 (file)
--- a/gpsbabel/pathaway.c
+++ b/gpsbabel/pathaway.c
@@ -588,6 +588,7 @@ static void ppdb_read(void)
     ppdb_read_wpt(route_head, 1);
     break;
   case wptdata:
+  case unknown_gpsdata:
     ppdb_read_wpt(NULL, 0);
     break;
   case posndata:
@@ -763,6 +764,7 @@ static void ppdb_write(void)
 
   switch (global_opts.objective) {     /* Only one target is possible */
   case wptdata:
+  case unknown_gpsdata:
     if (opt_dbname == NULL) {
       strncpy(file_out->name, "PathAway Waypoints", PDB_DBNAMELEN);
     }

diff --git a/gpsbabel/shape.c b/gpsbabel/shape.c
index 965ac7a04808155186a2079acaa59cd619a552fa..c394b7acea43d62d1de12347e856eb3c2071d8ac 100644 (file)
--- a/gpsbabel/shape.c
+++ b/gpsbabel/shape.c
@@ -314,6 +314,7 @@ my_write(void)
 {
   switch (global_opts.objective) {
   case wptdata:
+  case unknown_gpsdata:
     ohandle = SHPCreate(ofname, SHPT_POINT);
 
     if (ohandle == NULL) {

diff --git a/gpsbabel/stmsdf.c b/gpsbabel/stmsdf.c
index ea6b515657bdf407485c42bab4933c533428aac7..b80feddffe7d0abbdf3da7230ed5b93608e9796e 100644 (file)
--- a/gpsbabel/stmsdf.c
+++ b/gpsbabel/stmsdf.c
@@ -719,6 +719,7 @@ data_write(void)
 
   switch (global_opts.objective) {
   case wptdata:
+  case unknown_gpsdata:
     break;
 
   case rtedata:

diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c
index b3c7033977fb1c61db602eb1620d5433d4ab6847..df2dbede67648d8fbc1257eda7af248a5d808b84 100644 (file)
--- a/gpsbabel/stmwpp.c
+++ b/gpsbabel/stmwpp.c
@@ -300,6 +300,7 @@ stmwpp_data_write(void)
 
   switch (global_opts.objective) {
   case wptdata:
+  case unknown_gpsdata:
     what = STM_WAYPT;
     track_index = track_num;   /* disable filter */
     setshort_defname(short_h, "WPT");

diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.c
index 819a8403295f400440f46ad248d21f7627f42745..9028739afed889891dc6a2889c91e62bc9788662 100644 (file)
--- a/gpsbabel/unicsv.c
+++ b/gpsbabel/unicsv.c
@@ -1934,6 +1934,7 @@ unicsv_wr(void)
 {
   switch (global_opts.objective) {
   case wptdata:
+  case unknown_gpsdata:
     waypt_disp_all(unicsv_waypt_enum_cb);
     break;
   case trkdata: